Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 20:07:15 +0000 (12:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 8 Nov 2011 20:07:15 +0000 (12:07 -0800)
commit63db01c969c7adcb91b48a09ab3efdf28b3fbb46
tree743d74d64f5329613d1b82d4025042c8471664e1
parent782d5d53f52ac6320d5e03660e8ac175936a2b2c
parent2813640ce8937682db615c92a411c8b647970070
Merge from trunk.